UnlockDialog: add an explicit cancel button

Pressing escape to cancelling the unlock procedure is not discoverable
enough.
At the same time, fix styling to avoid bluish hover effects.

https://bugzilla.gnome.org/show_bug.cgi?id=681143

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index c3a0fe93f4d5ad94a91da94e3b7aaab4a464bc8b..cc568fbae1a1416b1c4c02c3e0471447fcddb1b9 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2173,7 +2173,7 @@ StButton.popup-menu-item:insensitive {
 
 
 .login-dialog .modal-dialog-button {
-    border: 1px solid white;
+    border: 1px solid #666666;
     border-radius: 5px;
     padding: 3px 18px;
 }
@@ -2185,13 +2185,13 @@ StButton.popup-menu-item:insensitive {
     border: 2px solid #16335d;
 }
 
-.login-dialog .modal-dialog-button:hover {
+.login-dialog .modal-dialog-button:default:hover {
     background-gradient-start: #74a0d0;
     background-gradient-end: #436d9f;
 }
 
-.login-dialog .modal-dialog-button:active,
-.login-dialog .modal-dialog-button:pressed {
+.login-dialog .modal-dialog-button:default:active,
+.login-dialog .modal-dialog-button:default:pressed {
     background-gradient-start: #436d9f;
     background-gradient-end: #74a0d0;
 }

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 4483b5bdb813a69457af27ef18cd746531f00217..8f2e6c2f6e26790ca7644b3d51010b00c01c3afc 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -126,11 +126,13 @@ const UnlockDialog = new Lang.Class({
         this._promptFingerprintMessage.hide();
         this.contentLayout.add_actor(this._promptFingerprintMessage);
 
+        let cancelButton = { label: _("Cancel"),
+                             action: Lang.bind(this, this._escape),
+                             key: Clutter.KEY_Escape };
         this._okButton = { label: _("Unlock"),
                            action: Lang.bind(this, this._doUnlock),
                            default: true };
-        this.setButtons([this._okButton]);
-        this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
+        this.setButtons([cancelButton, this._okButton]);
 
         this._updateOkButton(false);
         this._reset();